lib: Fix building against old glib versions

This commit includes libglnx.h in ostree-autocleanups.h, so we get the
g_autoptr backports wherever they're needed. Also, remove the "#include
libglnx.h" lines elsewhere that are no longer needed.

Closes: #1596
Approved by: cgwalters

diff --git a/src/libostree/ostree-autocleanups.h b/src/libostree/ostree-autocleanups.h
index 504954e00fb2a931a08dfdfdac4e5882981bb494..d1c94410ed3a8d4af8b7b82c567cef0e820aa7bb 100644 (file)
--- a/src/libostree/ostree-autocleanups.h
+++ b/src/libostree/ostree-autocleanups.h
@@ -24,6 +24,7 @@
 #pragma once
 
 #include <ostree.h>
+#include <libglnx.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/libostree/ostree-ref.c b/src/libostree/ostree-ref.c
index 0954cb0e752abbb428c2403dfba3ef2e19fcb004..9a4104990f00edef8483e0e26b771f4377794a74 100644 (file)
--- a/src/libostree/ostree-ref.c
+++ b/src/libostree/ostree-ref.c
@@ -27,7 +27,6 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib-object.h>
-#include <libglnx.h>
 
 #include "ostree-autocleanups.h"
 #include "ostree-core.h"

diff --git a/src/libostree/ostree-repo-finder-config.c b/src/libostree/ostree-repo-finder-config.c
index 5d1e15955cadc211b47a2e8a918e5008082a2470..58cf321c56d64b9ffe19e8f8df3f0d87942266e7 100644 (file)
--- a/src/libostree/ostree-repo-finder-config.c
+++ b/src/libostree/ostree-repo-finder-config.c
@@ -28,7 +28,6 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib-object.h>
-#include <libglnx.h>
 
 #include "ostree-autocleanups.h"
 #include "ostree-remote-private.h"

diff --git a/src/libostree/ostree-repo-finder-mount.c b/src/libostree/ostree-repo-finder-mount.c
index 09e850358b211fc596c16272cf104ee9030ec00b..117033dfa4c1710b4f2f1e7221d027dbc3e456f7 100644 (file)
--- a/src/libostree/ostree-repo-finder-mount.c
+++ b/src/libostree/ostree-repo-finder-mount.c
@@ -28,7 +28,6 @@
 #include <gio/gunixmounts.h>
 #include <glib.h>
 #include <glib-object.h>
-#include <libglnx.h>
 #include <stdlib.h>
 
 #include "ostree-autocleanups.h"

diff --git a/src/libostree/ostree-repo-finder-override.c b/src/libostree/ostree-repo-finder-override.c
index 5bad9ace91c0fbea50407724bc1b4a0fb09fa4e8..0ee0270dae2f8b7f69b68c07e54871f7e1d46087 100644 (file)
--- a/src/libostree/ostree-repo-finder-override.c
+++ b/src/libostree/ostree-repo-finder-override.c
@@ -28,7 +28,6 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib-object.h>
-#include <libglnx.h>
 
 #include "ostree-autocleanups.h"
 #include "ostree-remote-private.h"

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 3251880fd5d11db559f19b72bd0cc944f498ff95..43c187671cda51e47dad5cdde8495f161755e25e 100644 (file)
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -28,7 +28,6 @@
 #include <gio/gunixinputstream.h>
 #include <gio/gunixoutputstream.h>
 #include <gio/gfiledescriptorbased.h>
-#include "libglnx.h"
 #include "otutil.h"
 #include <glnx-console.h>
 

diff --git a/tests/test-repo-finder-mount.c b/tests/test-repo-finder-mount.c
index 55eb47fb25861556f4c95efefc4406f4e8638092..948a3245155f04f70f202e580cd4029d39908691 100644 (file)
--- a/tests/test-repo-finder-mount.c
+++ b/tests/test-repo-finder-mount.c
@@ -27,7 +27,6 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib-object.h>
-#include <libglnx.h>
 #include <locale.h>
 
 #include "libostreetest.h"